Commit before polymorphism change. Also added maps and sprites