I refactored everything and now I'm almost back to where I was.