Turn into class + make iterating easy