m2settings support

... lots of clean up as this project is a f'ing mess.