Committing before trying to implement good bootstrap stuff