Moved stuff out of incubator
(will never incubate because project is dead as a doornail)