working on conditional personal

almost done