60% done

Need a lot more work.