First commit: all stuff from our site, looks like working, but with errors
After merge c801182