v 0.0.2 - fully redone