Merging Antonio's Code for Miami landing changes into the official code-for-miami branch (hopefully)