Much cleaner now. v0.1.11