Adding functionality

Configure code mostly