Final commit

Core completed