most of the systematic adding stuff in place