Week6bb

These can be converted to haml to keep the nice clean look