emp app done, need to tidy up