updates todo
resolves merge conflict
add bookends in users
updates schema