Worked on #17

Did more Stuff
time:3