WIP: More work on as3