fixed CommandParser & copied rest of XY and View