0.2

Expanding class working now