hooked up some exception handling & fluent builders