Parsing essentially done & infinity working
parsing working & some error fixes