Finished separating things out