Committing version where we are now able to compile and run
tests added