Working on adding the call back stuff