made some progress/tests