Finishing Israfel

Ready for testing!