WIP Making it more flexible