added stuff ive already done