@damned partial commit, been hanging around