started separating things out a bit