Updating code to address numerous TODO tasks