Incremental commit adding Docker and CID

This commit should be amended with fixes to the new files (removing the merge conflicts, etc)