Growtofill option

Code cleanup + merge with danakj/work current code.