started adding typedefs
merge and tests