Fixed all of my code, want to put it somewhere else so things don't get muddled