Refactored, Started on custom contacts functionality