committing before some big UI changes