Pretty Much Done For now

Got contacts stuff left