cleaning up
first sketch for new scheme