Merged two projects into one... all in one place now
Commented out a couple of very demanding tests