Added new files and finish homework 2