Done for the day, cleaned up some more, consolidated, and added a lot of comments to help anyone that is better at coding than me