I'm hoping to have most of this finished up tonight or tomorrow, then I'll go through and fix any issues