requirement#1 finished

Working on #2