Comitting some dimension code, still LOTS do to :)