Pull of Dev round 1

See notes.md for future development