Everything is working now.

While I was debugging I decided to clean up some code that I was not happy with, and turned several parts of my code into functions.

Thanks for looking over things