Updates

Work in progress. Not complete yet. I would appreciate some feedback thankyou