New configuration

Work in process. Does not compile