WIP fixing type escapes