Incorporating basic bootstrap / reorganizing a little