WIP
Merge remote-tracking branch 'joelteon/me2' into broken-stuff
More changes (I can’t wait to squash these commits to get rid of these abysmal commit messages)
We need dirname
Merge remote-tracking branch 'copumpkin/broken-stuff' into me2