deleted duplicate class and moved some stuff around