Ticket 6

Working on #6 , first attempt