Initial work on parsing format