Initial commit
Added activeItem validation