still chugging away at reorganizing everything