WiP... merged everything into 1 universal class