Finished todo tasks and made for idea 13