Some incomplete work for cleaner infill logic
Infill refactoring and cleanup complete