Changed to Class Library for now