working on cleaning up and consolidating some code, haven't been working on this as much recently, got kind of burned out on it, I should be able to get a lot done during the week though