Move stuff around
less verbose
Add DefaultLogger