TODO: I wonder if this shouldn't be updated to use the modeling package now :)