still fixing a lot of bugs due to rebuilding the model