Refactored to use my.class.js class system
merged with new class system