Fixed alot of the bugs and errors in the implementation
Merge branch 'master' of github.com:Stringsy/psd3-groupwork