Some Helper Methods implemented
All helper methods updated, all tests working