Merged changes
Start of new interface
Merged changes from pull request
Create graph from cg
Merged work and home changes
Merged develop and master