Refactoring
Starting to make it work together
Solved merge conflict
Removed some thing that made spring go crazy