about to change to seperate class