Everything working now, hopefully