Issue 6/manage finished

#6