started implementing asset handling