Disabled some functionality. Pending fixes/changes.