Added everything so far(all working)