Added what I had so far (mid-stage development)