Initial commit 80% done