Tweaks and such to get the model working -- not completed