Complete Rewrite (Bump to v 0.1.0)