https://github.com/gad2103/shoestrap/commit/c93424af86da0dc4949cbeb8f1e645d482672eb7 on the new branch