Merge
Start no longer returns error
Merge