Emma commit 2

nowhere close