A lot of updates, implemented some simple angular into the solution