Angularize player, begin to merge Romain collision changes