Initial commit: still a lot of changes to comlete