Lotsa changes. PreApis