mask added, needs clean up and putting into it's own file now