Fixed parsing..sort of. Getting there.