Added filler patter [WIP]

+ utils clean up