Commit, before drastic redesign!