use dominus 2.0
moved stuff around