Integration Station woohooo

Integrated the koca commit and the Mega Commit.

The duct branch is now redundant.