- Some more initial setup.
- Addition of Avalondock for future use.