Work in progress, incomplete, and should be ignored by everyone else for the time being