checkin before refactoring how everything is positioned