Finished part 4 of AppState