In Progress

osc fixes december