Added dimension stuff (unfinished)