yeah, I gotta redo these bits