Added everything so far