Got the tests passing for the features that will be support in initial release