All things working, Needs Refactoring...

Will try to do some refacroting later tonight.