Made testing directory :).
Removed another unneeded event wrapping
Spaces
Made keys be in priority order of newest first