WIP: More as3 work