Refactoring to fix sizes. Still firing too often, needs peaking logic worked out.