Ton cleaned code up, cleaner UI.. going to resubmit this version