FEATURE: interim dev checkin