added in helpers and getting unit tests to pass