WiP

changes made while in Barcelona on vacation