initial commit
merge with Ivan's backend and small fixes