No longer setting the 'status' manually in any functions, to hopefully make it a little cleaner