Rewrite

Didn't like the other framework