Going to clean up code for fillers and maybe moved to fixed point...