Evan Commit

Hopefully looks a little more clean