More WIP progress changes to work on fill bug