Switched to a modular style, took out logging for the time being