(Fix) Some updates and stuff
store everything
(Feat) More work on integrating angular-material
Some work before rebase
merge