reverting some very work-in-progress / play around stuff