Initial commit. No major changes, updated header