Working on #23
Think I finished fixing width/height, closes #23