Starting adding check for necessary variables
Added additional interface checks - all variables should work get set properly now.