WIP updates to parsing functions