final commit of phase 0? i probably forgot something