Fan also added

This version is fully functional