A lot of restructuring/renaming to try and make it easier