Icehouse support

This commit does not include locks. Everything else is there. I will add locks later.