Removed expand.c (see extended description for why)
The method I used really isn't the best one, and you can always look in the git history to see it anyway.