Removed the old varibales from the block form functions.
cleaning up thte code and starting to add the new variables.