Continue to flesh out the base Source