feature 2

Finished implementing feature 2