updates, not quite finished
updates