Updated core functionality

Prototype is working as expected