added basic loading back in