Lots of changes. Core is progressing!