compile errors fixed, need to test