Method migration

Migrated collision detection methods out of marble and into simulation