Beta v1.1

Code has been dramatically simplified, OSs value is now incorporated
into the actual price making it more dynamic, other cleaning of code