wip (+7 squashed commits)
Squashed commits:
[f997c58] wip
[26275ca] wip
[17d7666] wip
[dc4ba19] wip
[1dd7f80] wip
[1dd1e86] wip
[4544c13] Ubuntu version of docker file