Added basic builder tool. No location validation yet