Finished lab 2.2 added in splatts and json calls for them