Massive update

Work in Progress(To be Squashed)