Cleaned up - still to add traits and read me

Need to shift traits across to here and tidy up as separate extension,
unlikely that dosamigos will want it as potentially to deeply coupled
to my own development - however may prove useful to someone else