Implemented a few hacky fixes to get stuff working again. Will have time to work on this soon as exams finish tomorrow