Fixing things up, trying to get edit in