More work on the amazon model
Added Onservation to hide away Instance usage
Some minor refactorings