Second commit

Renamed variables.h to header.h, also various changes... still errors.