Updated bookshelf + includes form + redid functions