Major rework/refactor
Bumped version to 0.0.12