finished 90% of my refactor and now I feel like I can add some interesting features with the new model design