v0.3 - added simple new class, moved some code inside