Committing Jeff's Home and Loading changes