started more work on separating things