First run at using dimensions. Should be broken into the builders later?