Working on my feature @john