Lots of changes throughout the classes and views, huge rework done