HW1-1 almost done, needs to take care of comments
temporary solution for comments