Old commit, waiting on new one with completed graphics