Massive Commit got lot of stuff done , Masive ui
changes , code still pretty bad