Fixed Dylan's problems, now we can get back to work after 4+ hours