WIP notes and attempts to get better data