view improvements
resolve merge conflicts
evaluate answers correctly
beautify stage 1
resolve more conflicts
refactor routes