second initial commit (now only for server apps!)