Another massive push

Just making a collective backup of what I have so far before beginning
the conversion to Ace.