Additional fixes in functionality
Major rename of all the stuffs
Tests now pass again
Fix final typos from refactor. Everything works again