More tidying up
Start adding preferences support