Moved research a bit, not sure if I like it