V0.0.4

Lots of refactoring.  Removed stock class.