Code

Merge early parts of branch 'ls/am'