Fixed redirect loop bug
Merge branch 'master' into chores
beginning to add some chore editing capability, not yet complete