Fixed masking problem
cleaned up the code - understanding objects better now