Moved from regular JS to OO