initial commit of e12
cleaned up code