More clean up
Buoy entity
Orion Canvas added
More OO cleanup