testing, begun reworking