Additions

Full to bursting. Little more to come. Still no working JSON.