Adding a couple entry points...