Removed some stuff, doing some re-thinking + coming from a different angle