Not really sure what changes I've made, but I'm keeping them, and it worksish right now.