Builds and starting to test
Bug fixes