stuff... sorry haha long time no commit, and this one's not atomic...