Wip
Add migration, add functionality, fix tests