Even more work on Assets