Initial commit
Several additions