Restructured pool object - much cleaner and easier to follow flow.