Starting to move parsing code to it's own file.