Feature/complete log