WIP updates to large amounts of the codebase