Fixes #21, and implements the Objects and Array types