Fixed that darn define vs class issue