Start of better unit parsing