Many changes. Compilation ok, fails in linking.