Restructured stuff, wrote prior chapter done