pull in stuff from old chropolr branch