More Features

1. nice first level (almost)
2. upgrades.
3. refactoring.