[In progress] Rewrite for v0.0.1

#8