DEV: more core dev