No more copy and paste what I have of old classes. Re-writing from scratch.