Little more work, but with errors
Fixed some errors
All current tests passing.