Add Check & GoHome Feature, Modularize