moving methods to where they make more sense to have