Refactored most of the code but recheck the models and views mostly plus the templates