Starting rewrite for version 0.1.x