removed main, test and todo's, added couple of methods to logger
merge