everything almost working, doing tests
tests working again