Work 6/24

EOD commit 6/24