final commit before big changes