Reoganized the code again, this is more difficult than expected. Added new urls and doing some tests.