first attempt to marry both code bases