Complete refurbishment

Work in progress