Really added Fillin this time!
And we reorganized class hierarchy