Work 6/23

EOD commit for 6/23