Initial version of Redesigned core
Removed some unused code