Cleaned up more legacy
Updated sample project to test the new check
Improved check method