Major Refactor (WIP)