dev: move more behaviour code into the right classes