masking going good
refactored an cleaned code somewhat