Issue1

Complete implementation of issue 1