Core WIP
Everything is in place