Progress on combining the two projects - doesn't build yet, though.