Removed constructor validation.
Working on structure some.