got the tests working and everthing else