restructuring, adding fills, broken build due to buffer overrun (?)