Merged Tania's debugged fill. Maximized for including. Needs heavy editing to make cohesive.