Initial commit of simplified core