halfway chap 5
Clean up testing, integrate bootstrap