- Making changes according to feedback from pull request
	- Adding back @Override annotations
	- Merging methods in to main solve method.
	- removed commented out code