Still adding UI Elements, looking for ideas on the best way to structure the app