rest implemented

Conflicts:
	.idea/workspace.xml