Add better parsing. It's broken tho