Havana WIP

Added bits that were missing from horizon that need to be found.

Included changes made by @jrcloud