Tom's new code for configuration and homepage