tidying up...getting there