Added pretty much everything required...

Almost done with this phase….just need to tweak a few things here and
there…