Mark current

This is slop - just getting ideas in - refine later