Anotherrrrrrr update. I swear this is finished this weekend