Feature/initial solution