Added BOM
And rejiggled some stuff