Continuing support for building from JSON including support for collections, just a little bit more needed for getting cross defined types to work right, also refactored a little bit to minimize the number of hardcoded strings