Finish basic structure.
Merge branch 'source'

Conflicts:
	.idea/workspace.xml