Few quick updates & converted JS class to use prototype.