Got stuff working after testing