Cleaned up some method naming, and added the ability to weld