Updated properties so can now handle booleans
Making very slow progress on the testing harness