Day 2 Commit

Too tired to commit individually… will refactor later if needed