Initial import
Quite done with core