FEATURE: Interim dev
FEATURE: more core dev.