More edits for testing and such.