moved source to header because of make conflicts