refactor to remove appogee lib