Moving class.js code over and beginning adaptations