Solving Merge conflicts, Addding Event manager plugin, styles n shit
New DB