Kind of fixed. Needs duplicate checking.