more pushing code around looking for, good design?