Several API changes, still under development. ONLY FOR PREVIEW