Better testing
Continued work and logging working now