About to slim it down with some new @contact variables