Loading on demand

Loading on demand now seems to be working properly