Committing this work in progress after a very nasty virtual box episode