final with a few style changes left
fixed folder name
ahhhhhhh
fixed merge problem