Simplified menu system, better ease of use. More tests and tidy up
required