All changes

All functionality  DONE!