Moving fills into a separate class (not working just yet, but will shortly).