Commit of partial work
More partial work
more work on refactoring
Able to get it to compile and all except 5 unit tests to pass. Call by name still not compiling