Add double width/height support. This passes all the relevant parts of