Small change to main.cpp's import arangement
Improved challenge, added dynamics and some extras.