Dev Mid-term merge

[yalsaffar]

Missing a lot of functionality, but has the main model which is fully structured but needs to be fully connected with different parts of the projects