Started work on parse errors in the Store