Need to clean up loading a bit further to make this work how I want.