More Rob style code

Still have to move stuff around but the structure is built so it should
be simple to change it up more.