refactor, messing with api..