Added notes from convo with tim