added preloading #36
needs design