big changes, almost all works
Working 100%, just need to clean it up a little
fixed another issue, cleaned code up