working on methods
tweaked the testing
superficial change due to problems pushing