Started refactoring into a brand new system. The old one was terrible :P Random update just because I'm bored! :)