BM: Initial commit with scaffolding