Long overdue commit, did a lot of shit, haha