Version 0.0.10 Pure OO design