Made variables classes
Reverted from variables implemented as classes