Commit leftovers
First commit for simBB