lots of changes -- especially w/ status logic