Draft with Castle
missing files and cleaning