splitting more stuff out
updates