started to port gme logic to new model