Moving more stuff into the parking lot - fixing up some export issues