I believe logic is done, adding comments