Starting to refactor translation layer

Want to return dictionary instead of Jarray