Methods reorg

Just a little ‘un