One major f'n overhaul
Signed-off-by:Craig Russell <tenowg@gmail.com>