Refactor Physics to improve performance[Don't merge]