Couple more interface changes. Still cant get some parts of JSON working