Resolved issue 6

Some work on 7