Added mostly everything