updated backend to be sligtly more managabl on my end