feat(lily58): migrated old to here, semi-working