More work on basic asset handling.