add more parsing and temp error handling