Added in framework for moving up. Moved some masking fields around.