REMINDER: create better git workflow