Under construction

making the changes live before our meeting:)