commit before reworking everything