temp commit
putting a stop for the night, made issues of remaining things
Merge branch 'feature/flannel' into develop