New data structures + debug