Add basic parsing, need whitespace handling