Currently I have a conflict in the new migration added for shib with a duplicate column. This is caused (I believe) by the new invitible Hyku code, and should be easily resolved.

Also need to test out invitible and see if it plays with shib work.