Changed to form methodology
Added fill extension
Added blocks
Updated package