Not finished yet, but trying to resolve version hell