Class

Added a class version of it