Done, just need to format stuff now