added builder, types
switched to april1 0.3.2