Progress!

Just needs some cleanup