New fla file, and moving some code to components