Initial commit of hack around code