Moved functionality to a class. There will also be a website