add more stuff for preview and getting close to a 0.1