added Simple JSON support and reworked some of the classes