1-5-8

Finishing out post update changes. Going in for testing.