Everything working pretty well but messy