Work in progress with new files