More updates
More updates - basic tests are now working