Mostly done

Still going to do some UI tweaking.