Use lockfile
Oh god merge cornflakes