Add an option to disable logs
Move things around