Major refactor.
release 0.0.2