Lotsa more working on parsing