Basically reverted the last commit and moved forward. Almost there.