moved functionality into a self-contained schema +covest