First stab at thor-free builder