Pushing latest updates

My new work. Everything else being deleted.