basic edit ad complete
merge conflicts in indexcontroller fixed