Changed method names. Hope they are more meaningful

Changed method names. Hopefully they are more meaningful. Also wrote some tdd tests that i use to test my changes might push that in a new PR.