Changed some naming stuff and added Block and Item Class [pause]