tidying up. re-integrating with droom