Error checking and additional items
Build + Error checking