committing leftover stuff from last week