Commit new version. Still has bugs.