Daniel's User Story

This includes Daniels code integrated into the project