Finished development

With a little delay because of exams