Added more functionality to the abstractSearch, removed code that wasn't being used and made some code look prettier.
Merge branch 'MoreRestStuff'

Conflicts:
	.idea/workspace.xml