Updates to Nick's changes, everything except the post methods seem to be working

[#55676990]