Before baffles...
After baffles...
Overflow box drains to portion on the left where I was going to put skimmer, then baffles, then return pump sits in section on the right. I've added so much water to cover that pump that I think I'm in trouble if the power cuts off.
But, I still have a tank...