Spit and polish and new JS class.