work on separation engine and dev
separate engine and dev complete