Many new updates

Ready for merge with old game engine