new methods!
added test file
test and condensed methods