Work

a mix of work that i either missed or didn't get pushed