Moved Helpers into own File
Merged with master