obligatory commit
moved some code around, deleted some, and simplified some naming - next up will definitely be to test the GPU