Ithaca updates

Updates from Paul's forked repo