todos updated, prints taken out