first half decent version, ready for tests with site