Start work on parse function
Fix merge conflict