Started newidea
Big fix
Finished newidea
Merge branch 'newidea'

Conflicts:
	readme