Working Commit

It works, woot!