Improved Entity code, added Scene. BROKEN.