Ported more code; This brings back memories.