Moved parse to it's own module