Finish check in and check out queries
Fix merge, add some manual getters