Fixed up visibility and variables/methods to match class diagram. Added methods in the stock class for calculating feedback values for Android display purposes