First cut at adding ability to handle energy rays