last commit before breaking changes

it might get messy