week 1 ideas implemented
fixed merge conflict