A lot more general work on getting the base project working.