In interest of rapid development commit messages on `hack` branch will be brief. Minor changes and setup.
Removed icomponent, going to play with not having it.