2nd commit

some more updated functionality