Finished cleaning up rest, need to implement rest of json and forms