User/logan evans structure

@cevans87 @BigDCross