Merged refactored code into the main branch. Collision with the cup is currently broken (will literally crash openGL), but everything else works as it did before. Will work on the bug soon.