server logging
logging and some todos for monday
merge