Ericdev

Bringing backend inline with master