Element class reworked

single class instead of dumb matt ideas