cleaning up, testing some ideas