Broke comfort.y up into separate files, added headers