Filling and fontlocking

This is the big thing I spent the last two days working on. And somehow I managed to forget to PR.
oh, checking for the type of object would be safer, albeit more verbose. I'll look into it.